From dce021d06abfae3cb5613c1a7856cff56f79c5ad Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 18 Dec 2008 11:29:33 +0000 Subject: [PATCH] xenoprof: Add support for Intel Dunnington cores. Signed-off-by: Xiaowei Yang Signed-off-by: Ting Zhou --- xen/arch/x86/oprofile/nmi_int.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 4f62262cec..ef5d1227fd 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -65,6 +65,8 @@ int passive_domain_do_wrmsr(struct cpu_user_regs *regs) int type, index; struct vpmu_struct *vpmu = vcpu_vpmu(current); + if ( model == NULL ) + return 0; if ( model->is_arch_pmu_msr == NULL ) return 0; if ( !model->is_arch_pmu_msr((u64)regs->ecx, &type, &index) ) @@ -366,11 +368,10 @@ static int __init ppro_init(char ** cpu_type) case 14: *cpu_type = "i386/core"; break; - case 15: case 23: - *cpu_type = "i386/core_2"; - ppro_has_global_ctrl = 1; - break; + case 15: + case 23: case 26: + case 29: *cpu_type = "i386/core_2"; ppro_has_global_ctrl = 1; break; -- 2.30.2